Fix bugs and style the button