Version 2, includes page breaks and much cleaner UI work