Fixed design issues