Remove redundant batch script
Major rename of handlers
Rename widget names