layout refactor
add experimental wimote support