Various refactors, fixed height in iOS Safari, cache headers