Fix bugs

...res/add-layout

Conflicts:
	public/sass/styles.scss