adding navbar to demo and fixing minor bug with cancel button