Brush up of some styles. Bug fixing