refactoring, more ui for market
just a couple more iterations to go