Finishing client views #6