UI Fixed

Changed back to Relative Layout from LinearLayout
Merge branch 'master' into gh-pages