Fix problem with Field reset blocking the UI. Improve look