styling and functional tweaks