Finsished new layout
Added new layout