Fix first page bugs