Better UI

Better UI but implemented with quick & dirty way in source code