Multiple scale, layout fixes and improvements

Authored by Aiix on Jun 12 2018, 10:38 AM.