added some  styling and new features