Added new UI + cleaned up level