Add completed includes and layouts

base-style still needs major cleanup....
Yes, I am planning on using SCSS for this job