Updates to layout = now respsonsive

Changes include minor refactorings