HB-015: Small refactoring, carousel addded