Added control classes and centralized username fetching