Layout work

Approaching completed layout, just need to work on buttons (if needed at
all)