Revise UI structure and update content
Merge pull request #5 from Sachaniman/master

Revise UI structure and update content