Small style tweaks
Fix wrong status on dm2 validation errors & improve focus handling
Remove redundant code & improve usability a little