Header Cleaning, buttons update