Refactor/re arrange ui elements