Merge remote-tracking branch 'origin/Fragments' into Fragments

* Some Layout Changes