added a little design style - plus other functionality