Fixed alternative header and remove empty view image where necessary