Various bugfixes and styling adjustments