Updated styling and removed unneeded promises