add inputmultiplexer; add return/quit buttons(but they do not show yet)
fix merge conflicts