Fixes #347 - Carousel refinement

Carousel refinement

fixes #347 - Re-worked carousel to have cleaner look/functionality.