Reorganized object modal

![screen shot 2014-07-16 at 3 38 35 pm](https://cloud.githubusercontent.com/assets/6219591/3604500/e7cee56e-0d20-11e4-8bf6-325004f48259.png)