fixed up UI and some font / spacing