Removed some redundant code and fixes

Site nagivation editing was broke.