Improve focus style (this closes #5)