fixed some issues with display of buttons / labels