Few cheeky fixes, only problem is CSS is now too big