Update layout of general settings page

![cs-general](https://f.cloud.github.com/assets/2231759/2503811/4c8ca076-b386-11e3-92a7-4199d22a23ad.png)