Added completion, cleaned up views