Some further changes for readability and minimal footers