Improvements layout master header