Styling improvements + bugfixes.