UI Enhancment for account buttons