Move output control buttons. Resolves #1