Added better save layout