Added scratching view, fixed bugs in design