Fix up empty view & reloading