updated layout some more and made the rakefile better ish