UI improvements. #79