Refactored drawer and swiper, feature-container no longer needed