Header file and minor layout changes