rearrange some stuff
add vote screen