Windows forms client refactor