Combine both the versions

the navigation drawer is yet to be changed