Fixed minor design issues