fixed several design issues
fixed minor issues