Refactor + new clients + rating selection view