Fixed issue with watch of selected variable, added navbar and separated key file