Improvements on the ng apps