Fixing few minor bugs
Fixing the toolip postion