Add tabs to secondary screen

* Also add mod-shift-j and mod-shift-k swap behavior