added some front end sexiness
merging in alexs changes