Some refactoring

Working on ceremony page