changed button layout, fixed crashing bug.