styling and UI fixes