Implemented more UI, state pushing.