making some fixes for webkit & firefox