optimized for firefox, safari, and chrome
resolved merge conflicts
testing responsiveness