added some options management and better styling