Added fancy button, updated display logic.