Cleaning

- Nib added
- Settings page