UI fixes: SPARK-848, 849

This should fix the problems suggested in [SPARK-849](https://spark-project.atlassian.net/browse/SPARK-849) and [SPARK-848](https://spark-project.atlassian.net/browse/SPARK-848).
![screen shot 2013-08-05 at 1 06 43 pm](https://f.cloud.github.com/assets/4754931/912904/bad3afc0-fe0a-11e2-87f7-63a020f95481.png)
![screen shot 2013-08-05 at 1 06 28 pm](https://f.cloud.github.com/assets/4754931/912905/baf74408-fe0a-11e2-8bc7-a12b2936caa6.png)