[0.2.4] Clean up UI a wee bit