Improve stylesheet + ui