[AS] Refactor and improved uis