Fix views, add more styles