more functional

UI now more functional