Some more esthetic changes