Ui work 6

- Moving the last includes/macros in /twig to their folders
- New unified page headline handling using the new pag_subtitle block
- Some indenting and formatting
- Additional bugfix for #1491, where some changes were missing