Some UI changes
Something working on..