Improved following UI