cleanup urls into seperate files
fixed wrong navbar highlighting