Fixes to view helpers and styles