Finish layout and routes
del guard for ruby2.0 aganist
merge fill-in-layout