Improvements layout master header (in progress)