Styling, bugfixes, and more