Some views modifications