updated layout position/sizes according to Marco