Doc & Look and feel update