Polished UI and enhanced code