Use one layout for all devices (fixes #3)
Code cleanup