Added new widgets + updated naming convention