Feature/add more buttons

code review please