navigation drawer added
merging