Added more basic layouts. Slight restructure