IMP : UI Restructuring
Merge pull request #1 from jluchiji/master

Beginning UI Restructuring