add buttons interface
fix conflicts