Navigation drawer added and bug fixed