fixes UI - BETA ready