Removed some unnecessary icons & navigation parameters