More cleanup, decrease box-shadow, backup for Safari (untested)