settings
fixed angular templating errors and code tidy