reimplemented navigation drawer + huge cleanup