added basic Nav Draw Handling (Very Basic)