Fix issue with focus.
Make things slightly nicer.