Added some new classes change some styling

Moved a few buttons suggested a couple of methods and 'classes'