Beginnings of create page + general refactoring