repaired remove, added some navigation