Fixed user view with less rogue code