Updated UI - somewhat functional