merge
added background + nav  bar