IMP : UI Restructuring Continued (WIP)

Partially switched to MVVM
Made some layout improvements