#23 All buttons where added