- Fix layout issues
- Update button background
