Fixing up a few minor UI tweaks.
A few more status changes and UI tweaks.