reworked layout and scaling