Fix Firefox layout bugs
Read for production