Fix views and add other styling