added carousel, cleaned up structure a bit