Many changes to terminals

I mostly changed how terminals are used, to get ready for server specific terminals while still working with menu.