Better looking first screen, fixed Undo bug