Small fixes in view