refactored into angular, still no styling