Tweak layout and fixed a broken save layout