- Some layout changes
- Bug fixes