files cleanup and minor layout fixes