Buttons added + organizing.