Reworking active account detection logic.
Simplifying accounts display logic.