Tweak display
Add xp type views support