Bug fixes

Minor bug fixes:
- Saving settings
- More layout and usage bugs