More work on new discussion page