Minor tweaks and light styling