Code updated based _s starter theme