UI change

basically finish the app