Restyle some elements and fix some bugs