Fix button selector
Better structure