Feature/design plukk #17 #18