UI layout ok
add button
fix conflict