even more simplification
make button assignment more intuitive