UI redesign
working on SMART fuctionality