style and function updates
merged css updates