Resolved the remaining CSS issues