Updated controlbar styles to work with affix without hardcoded offsets