Bug Fixes / Improvements

Carousel and Overlay related bug fixes and changes.