Fixing navigation so you can remove items