Improve subscription view