lots of ui adjustment, more incoming