Added some minor changes on Manager folder