Further improved layout