Amey : UI upgrade