small fix and improvements in view