Clean Up and UX Optimization