Remove hardcoded IDs, more semantic css and vars everywhere