Wanted to merge the final css chages

[watchoutfreedom]

Probably some merge conflicts, recheck, thanks. Need to update the website, it's not updated to final state