Another UI remake; progress on #4