Add preferences and made prettier