updated UI - not tested yet