Simplified Jekyll layout structure

Made everything a little easier to manage layout wise. This can be
further optimized by using page classes to define conditions to include
other files. Also styled some of the additional pages.