add class structure; layout improvements