New UI design

First Step Logic Implemented