UI Updates

Circular buttons added.  Bug fixes.