Removed some filler, styled the buttons, added some missing things.