AS add more ui tweaks