switched display order

Signed-off-by: Ninjaparade <yazjallad@gmail.com>
added check for attribute causing errors with Datagrid...

Signed-off-by: Ninjaparade <yazjallad@gmail.com>