re-arranged buttons