Header fix

Added header mask, fixed some position