Fixed bug with labels and selected buttons