Fixes and even more styling