Add and refactor buttons and lists