UI bug fixes. Button structure.