Made changes to idle timer functionality, and some formatting changes