Alignements improvements and button header adjustements