Fields list updating

Many updates, looks much better