first implementation of new ui
contains changes on some methods...