last fix all error, added new widgets and refactiring