WIP: reorganize GLOBAL fields into nested array, start to better theme of view