Updated content/layout/styles.. still needs work