better keyboard and mouse support
more rearranging