Some changes to ui
comments refactored to use a common module