UI improvements. #73