A bit of cleanup done - started on widgets for GUI