Roll view made better, minor big fixes