Implementing UI

Improving UI