Updating buttons with fixes after UX review