fix my part :) and create UI for test