fixed formating
Fixed all conflicting % to px