fixing warnings and buttons
still fixing layout
Merge pull request #7 from thebitisland/layout_fix

Layout fix