Update packages, appropriate changes to follow updates (remove hacks, fix CSS issues)