Layout issues fixes in different browsers, Hotfixes

Layout management for browser compatibility
Some beautification stuff added
Fixed bug concerning two activity models under same activity
Patch for demographics handling in new scenarios