Made some more view and theme changes.