Modified Layout and scaling