Minor adjustments mostly based on guesswork at the moment - need to read more on AngularJs