Updated styling and fixed views