Updated styling and UI
bug fixes