commited for consistency sake
refactored ui
fixed erp connection