Single view updates and bug fixes

Majority are changes incorporating the feedback received about spacing.