Do more work on view/css