Organize forms a bit