various bug fixes and improvements to the different views