Gpii 878

http://issues.gpii.net/browse/GPII-878
The are many divs that have to be removed but the clean up of source code will be made in a new JIRA.