Fixed some layout problems, added on-click for each button