Regexp changes, UI changes

- first cleanup of regexp

- some changes left off from the UI changes that were not in the views
themselves