Several fixes. Removed clickable lined its for now due to issues.