Fixed layouts, added empty pages