widget: refactoring. used macro for widget creation conditional statements.
widget: removed unused parameters in separator.