add empty and disabled options to btns
add spinner dependency
fix the layout from the merg