Fixing Org not valid yet during creation for sidebar and top padding