Adding Active flag and cleaning up UI