Make layer order in form consistent