Added navigation drawer, improved media controller behavior