Fixed validation introduced in v2.6, change GUI order