fixed UI issues and restructured UI

bug
Merge pull request #700 from safiyu/issue5

fixed UI issues and restructured UI