Major change in UI-structure following a great tip from Joe!