fix button
fix layout