merge in barker css/js