Updated with better UI