Fix some design details and the buttons url