Fix Safari positioning issues; alignment fixes.

This is a work in progress; please don't reverse anything without dropping me a
quick message.