Change battle layout, add user token indicator, fix results code