Added shape view
Change use of int to NSUInteger