- minor code changes
- first set of UI