Add initial set, make code bigger, consistency in buttons, general clean up