More corrections to buttons and drop downlists changes