Added a lot of stuff and fixed page alignment