Added buttons instead of selector