changed some conditionals so the right buttons show up