UI Reorganization branch

For #58