Enhance PMU and Aesthetics