Unified styles; fixed bugs