Visual changes, added buttons, rearranged some things