ticket:3 Design stuff