The Layout is now more in line with the mockup from T2348. This
also adds a placeholder for symetric encryption that is currently
disabled as its not yet functional.