IMP : UI Restructuring Continued (WIP)

Partially switched to MVVM
Made some layout improvements
Merge pull request #2 from jluchiji/master

IMP : UI Restructuring Continued (WIP)