Feature/button redesign