Updated layout and rakefile