Design changes as per ticket