Redo view and CSS changes

These didn't make it in with the merge. So, I re-did them.