Look & Feel Fix