improve UI. Now in a usable state