First pages commit
Fix messed up things