Fixed small design issues
Fixed small design issues