adjusted design and layer hierarchies