Visual fixes and tweaks