Added option to use System Look and feel