Fixes to look and feel