restyle and add details button
merge