Add warnings and fixed buttons