Improve layout for carousel. Cleanup markup.: