fixed minor design issues