Improve link between App, Machine and Server.
Improve main page.