Updated UI and new features