Cleaned up and fixed visual feedback in client