Feature/buttons

#6