JOINDIN-487 Update markup to remain consistent with website style