Final format, for now. Can serve as template for other pages.
Merge remote-tracking branch 'origin/master'