Merge pull request #28 from RitwikGupta/master

Fixed navbar
Added phone number and provider as well as option to edit features