Refactor navigation drawer + update layout to handle action bar overlay