fixed disabling buttons and hiding the highlight