CSS and UI polish by Griffin