More Bug fixes in yearview