basic layout
fixed conflicts on development layout.scss