Cleaning up code

- Removed some commented code
- Fixed issues with tableviews in .xibs
- Padded settings headers slightly more