AJ-1573 Building out UI for tiers