Refine look and feel

Refine look and feel