cleanup
simplified navigation drawer + various enhancements