Remove border and fix button
Remove border and fix button