Final changes : theme, layout, nav