minor changes; look&feel changed