New styling
Small fixes