Improved styles
Fixed issue #26