Adding in Trevor and Fahad UI work