Improve some layout and improve the buttons, make colors and fix some labels