even bigger changes. UI done