some adjustments to fix bugs
added like button