layout and style changes
conflicts in styling resolved