Adding basic layout

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'feature/layout' into develop