Some UI changes for more responsive