Changed the way the page displays and what a bit of more minor stylechanges
Possibly avoided the Selenium test errors from testing DOM-element values
Merge