Prevent painful scroll bars + Some little improvements