Fixed windows focus bug and added icon