fixed a few bugs
added focus icons