Disabled buttons appropriately, and other minor UI touch ups