polished for better UI