Re-arranged buttons and refined desctiptions