Lots of tweaks and 4px fix