Fix some styling, hopefully final version