Delete commented code
Hide disabled buttons
Layout change