Moved container element to root template (<section>), added in expand functionality.