Updating Settings restarts activity monitoring

Updating Settings restarts activity monitoring,
minor changes in some layouts.