Updated with first version navigation drawer