Refactorings and small homepage fixes