Improved support for old devices and almost finished two pane