Cleaned up UI in individual event