fix bugs
tackle the focus issue