CSS Fixes
Merge remote-tracking branch 'origin/rebirth' into rebirth