Refactor: done refactoring the data part
Refactor: refactored some UI parts. Still in progress
Refactor: done