Improved actionfields resolver
UI improvements