with some improved styling