Bug 1007569: Fixed screen hang issue. Fixed UI to match UX spec.