Final changes

Changed app to stil be functional without web connection.