Some views improvements