Updated views/styles to be consistent with old branch.