Refactor layer and move layout to css centering