Added remove feature and some UI elements & navigation  changed