Added new layout for setup