#434 UI pretty much complete