After merging all the functionalities together, there is some refactoring/cleaning needed, as well as some last bugs need fixing
Still needs work:
(see screenshots)