More view fixes.. Now 100% bug free