layout restructure

fixed problems related to building interface on mockup without proper
elements (breaking scalability etc)