Merge CSS tabs to Friday demo (with fixed packages)