Fix some layouts and move images into repo