added a really simple spinner between text and buttons.
cleaned up deprecated constants.