Cleaned up buttons, adjusted 'disabled' states