Improve profile view state