Updated UI for everythiiing