Change design a little and add a new ticket