some design work on users control mostly