CHANGE: Move components to base class and add filed for gender at dashboard