UI improvements http://cl.ly/VtUd/o