GUI refactor
Merge branch 'juan' into lmt-upstream

* juan:
  GUI refactor