fixed carousel and loading
small changes
merging
added styling changes
changes
changes