Better organization of aliases and exports
Tidy up screen config