Fixes by Andrej M. - design and count views