Made buttons more rebust