Fixed Control Focus, and added some focus effects