Updated code

Added features, moved sketch pad to own window, fixed small errors