Add a full_title helper
initial layouts
fixed conflicts