flat-btn fixes