CSS Structure changes and cleanup