AUTO-919 : html changes for merge with AUTO-904
AUTO-919 : css fix for merge
AUTO-919 : more css for merge