Cleaning up house.
Fix utility buttons.