Removed debug, fixed UI