Added drawer functionality and some minor changes