Fix btn ui
Add comments and replies