Serious style changes
Fixed