Fixed tooltip interfering with save button, fixed button alignment