UI Optimization Part-1

3 layouts almost done