remove redundant finish()es, make lower level drawer navigation more
general