Layout, text, and MacBuildServer Fixes

Enhanced layout to look a bit more "together", changed some texts to be easier to understand, and the XIBs can now build successfully using MacBuildServer.
![screen shot 2013-06-29 at 2 04 19 pm](https://f.cloud.github.com/assets/4595626/726493/7e5107e6-e0ff-11e2-926e-b1f3e388ef09.png)