changed UI. added some function though still unused.