posslbly fixed the look&feel bug? (needs to be tested on a mac)