Update layouts, refactor haml and sass.