updated ui
Merge branch 'improve-market-ui' into development