Improvement Astro UI