Final layout changes

Made some fine tuning to the buttons. No more changes please