Updated styling and tweaked views