fix button style
Some reorg.